From 2ffae9c0c13a9d2af4b6d779f3cad1902d1f38be Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Sat, 28 Dec 2019 14:13:46 -0600 Subject: [PATCH] Fix so "make check" does not pick up tox results --- Makefile | 15 ++++++++++++++- README.rst | 1 - 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7078d69..7f1ab70 100644 --- a/Makefile +++ b/Makefile @@ -31,4 +31,17 @@ export COV_CORE_CONFIG := .coveragerc export COV_CORE_DATAFILE := .coverage.eager # For clean -COVERAGE_STUFF := $(COVERAGE_STUFF) .coverage.* +COVERAGE_DATA := .coverage .coverage.* +COVERAGE_STUFF := $(COVERAGE_STUFF) $(COVERAGE_DATA) + +# Because we're testing fixtures we need to accumulate +# coverage data with --cov-append for pytest. But this +# leaves coverage data files laying about which interfere +# with subsequent runs. Remove the old data before +# running pytest again. + +.PHONY: rm_coverage_data +rm_coverage_data: + rm -f $(COVERAGE_DATA) + +check: rm_coverage_data diff --git a/README.rst b/README.rst index 6b9b7cc..4bab104 100644 --- a/README.rst +++ b/README.rst @@ -22,7 +22,6 @@ .. #End Of Copyright Marker# .. Bugs: (Due to fixture testing) - "make check" picks up tox tests "make run_tests" leaves .coverage.eager.* files about Probably we need to get rid of the .coverage files in both cases. (removing .coverage fixes "make check" pickup of tox dirs) -- 2.34.1